trivial changes from @spitters
Merge pull request #495 from mikeshulman/master

trivial changes from @spitters