Merge pull request #5 from boiert/master

Merge pull request #2 from this-that-other/master