fixed bugs
Merge pull request #114 from teharrison/master

fixed bugs