Merge pull request #27 from missoby/master

design
Merge pull request #28 from missoby/master

design
pch 28
design