stage36
Merge pull request #108 from saszawa/stagebranch

stage36
Merge pull request #109 from saszawa/develop

Develop