Merge pull request #2 from JST-CN/master

Merge the latest version form JST-CN:master