commit by jayliZZ
Merge pull request #58 from jayli/master

commit by jayli