Merge pull request #14 from missoby/master

design
pch 12
pch 13
design