Merge pull request #1 from stephenboles/master

Commit
Merge pull request #2 from stephenboles/test

Merge pull request #1 from stephenboles/master