Flesh out test suite a bit, fix #10
Merge branch 'dev'
Build 0.5.10