Merge pull request #1 from szszss/develop

v0.1 Milestone1