Merge pull request #35 from ken1flan/develop

2014/06/28 リリース
Merge branch 'develop'
Merge pull request #36 from ken1flan/master

nazo