stage48
Merge pull request #160 from saszawa/stage-addB

stage48
Merge pull request #161 from saszawa/develop

Develop