minor updates
Merge pull request #1 from hmason/master