fix a bug
Merge pull request #20 from ryaninhust/master

fix bugs