Merge pull request #29 from missoby/master

design
pch 29
pch 29
pch 30
15/09/3013