Merge pull request #28 from koma75/develop

Develop