Merge pull request #2 from masayoshimashita/master

Merge branches 'master' and 'Devel'
Merge pull request #3 from masayoshimashita/Devel

Merge pull request #2 from masayoshimashita/master