Merge pull request #3 from AlanOGHub/master

Merge pull request #1 from IanCaldwell/master
Merge pull request #2 from IanCaldwell/master

Merge pull request #3 from AlanOGHub/master