bug fixes
Merge pull request #27 from teharrison/master

bug fixes