Merge pull request #1 from landrews/master

updating
Merge pull request #6 from landrews/UAT

Merge pull request #1 from landrews/master