Merge pull request #159 from timschofield/develop

Develop
Merge pull request #160 from timschofield/develop

Develop
Merge branch 'develop' of github.com:KwaMoja/KwaMoja into develop