Merge pull request #1 from jsjv/master

sync up
Merge pull request #3 from joahCN/master

Merge pull request #1 from jsjv/master