Merge pull request #23 from koudaiii/design

:put_litter_in_its_place: