comti by jayli
commit by jayli
Merge pull request #1 from jayli/master

bugfix