Merge pull request #1 from shun159/develop

initial commit