master commit 1,2
Merge branch 'master' of https://github.com/gimslab/gitest0624