Merge pull request #1 from dannuttle/master

Test pull request