Merge pull request #175 from tkowark/develop-ja

Develop ja
Merge remote-tracking branch 'origin/develop' into develop-ja