Merge pull request #20 from missoby/master

design
pch 21
design