fix #6
Merge pull request #7 from technicalmachine/jh-fixes

fix #6