Merge pull request #69 from cquinn/master

Misc small changes.