Merge pull request #2 from simon-liubin/develop

init