fix #11
Merge pull request #25 from CapillarySoftware/more_tests

fix #11