Merge pull request #1 from brhoads/master

Staying up-to-date