commit by jayli
comit by ayli
commit by jayli
Merge pull request #3 from jayli/master

bugfix