Merge pull request #2 from simon-liubin/develop

init
Merge pull request #3 from simon-liubin/master

Merge pull request #2 from simon-liubin/develop