Merge pull request #1 from brhoads/master

Staying up-to-date
Merge pull request #3 from pmosbach/master

Merge pull request #1 from brhoads/master