Merge pull request #1 from shun159/develop

initial commit
Merge pull request #2 from shun159/master

 Merge pull request #1 from shun159/develop