Design merge
Merge pull request #8 from terakoya/design_merge

Design merge