fix bugs
Merge pull request #34 from teharrison/master

fix bugs