Code clean up and more tests
Merge pull request #34 from doug-martin/master

Code clean up and more tests