Merge pull request #1 from koudaiii/design

Design
Merge pull request #1 from koudaiii/develop

Develop
Merge pull request #2 from koudaiii/design

Design