Closes #108 and #79
Looks like the main difference is that xlsm is now supported, so I added test for it.