stage45
Merge pull request #153 from saszawa/stage42-43-44

stage45
Merge pull request #154 from saszawa/develop

Develop