Merge pull request #2 from lbarstow/master

Merge request