Merge pull request #2 from shun159/develop

merge develop to master