added Casseys tests
Merge branch 'master' into Cassey
Merge pull request #19 from clottman/Cassey

Cassey