Merge pull request #1 from szszss/develop

v0.1 Milestone1
Merge pull request #2 from szszss/master

Merge pull request #1 from szszss/develop