Tests pass
Merge pull request #1 from woodall/pset2

Tests pass