Merge pull request #66 from binnisb/develop

This fixes #65, with test. Awesome work @binnisb!