commit by jayli,bugfix
Merge pull request #59 from jayli/master

commit by jayli,bugfix