fix bugs
Merge pull request #33 from teharrison/master

fix bugs