Merge pull request #19 from missoby/master

design
pch 21
design