ch2 branch
Merge pull request #2 from bozcotty/ch2

ch2 branch