Refactoring
Merge branch 'issue-8' of github.com:hayaku/hayaku into issue-8