comit by jayli
Merge pull request #56 from jayli/master

comit by jayli