Merge pull request #21 from missoby/master

design
Merge pull request #22 from missoby/master

design
pch 22
design