Make #58 actually work and fix tests
Merge pull request #59 from alexspeller/oops

Make #58 actually work and fix tests