Merge pull request #2 from masayoshimashita/master

Merge branches 'master' and 'Devel'