Fixes #105
Merge pull request #107 from yuijim/issue-105

Fixes #105
Refactoring.
Merge branch 'master' of https://github.com/xhtmlized/generator-xh into issue-34