Merge pull request #1 from cattaka/develop

develop
Merge branch 'alpha'