Merge pull request #14 from koudaiii/design

Design
cosmetic context