Tidy.
Merge pull request #91 from csmith/master

Tidy.