fixed bugs
Merge pull request #57 from kyledaugherty/fixing-some-buge

fixed bugs