commit by jayli
Merge pull request #54 from jayli/master

commit by jayli