Fix bug
Merge pull request #12 from JerryLocke/master

Fix bug