Merge branch 'master' of https://github.com/NoguHiro/hacky_and_rocky
fiexd 25
Merge pull request #37 from a1153tm/master

#35 再度修正