Minor improvements
Merge pull request #1 from standage/master

Minor improvements