Merge pull request #17 from koudaiii/design

Design
Merge branch 'master' into design