commit byjyli
Merge pull request #35 from jayli/master

commit byjyli