Merge pull request #137 from alexjfisher/master

Trivial fixes.