Merge pull request #1 from evandeslunt/master

Merge pull request #1 from gcorcoran/master