Merge pull request #1 from rggibson/master

merge small changes