Merge pull request #10 from KwaMoja/develop

Develop
Merge pull request #496 from timschofield/develop

Merge pull request #10 from KwaMoja/develop