comit by jayli bugfix
bugfix
Merge pull request #61 from jayli/master

bugfix