more unit tests. hooorah
Merge branch 'master' into newSillyBranch
Merge pull request #23 from clottman/newSillyBranch

New silly branch