Bug fixes

Merge pull request #7 from wickwirew/master

Sorry I've been unresponsive, if it passes our test suite then I'm happy to merge it. If any issues arise, I'm sure we'll hear about them. :)