Merge pull request #262 from timschofield/develop

Develop
Merge pull request #263 from timschofield/develop

Develop
Merge pull request #5 from KwaMoja/develop

Develop