kawahara_GitFolwTest_hotfix
Merge branch 'hotfix/1.0.2-somefix'