Merge pull request #1 from lbarstow/master

Merge request
Merge pull request #2 from hjfender/master

Merge pull request #2 from lbarstow/master