Merge pull request #1 from steve-downing/master

Pulling changes from master back into development.
Merge pull request #2 from steve-downing/development

Merge pull request #1 from steve-downing/master