Merge pull request #1 from gcorcoran/master

I like puppies, and this is a test
Merge pull request #1 from evandeslunt/master

Merge pull request #1 from gcorcoran/master