Merge pull request #163 from timschofield/develop

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