Merge pull request #26 from missoby/master

11/09
pch 26
pch 27
pch 27
pch 27
pch 27
design