Merge pull request #90 from csmith/master

Fix compile error.
Tidy.