Merge pull request #1 from IanCaldwell/master

Ian_changes
Merge pull request #3 from AlanOGHub/master

Merge pull request #1 from IanCaldwell/master