Merge pull request #1 from simon-liubin/develop

Develop
init