Merge pull request #1 from koi-nobori/fix_1

Add description
Merge branch 'master' into dev