pch 15
Merge pull request #16 from missoby/master

07/09
pch 16
pch 17
pch 18