Merge pull request #1 from jrkirby/master

request
Merge pull request #2 from barcute2/master

Merge pull request #1 from jrkirby/master