Oops.
Merge pull request #141 from JonathanWarrick/cleanup2

Maybe this time!