Merge pull request #2 from jsjv/master

sync changes
Merge pull request #4 from joahCN/master

Merge pull request #2 from jsjv/master