Merge pull request #33 from missoby/master

24/09
pch 38
pch 38
pch 39
design