Merge pull request #18 from missoby/master

design
pch 21
design