Merge pull request #1 from stephenboles/master

Commit