Merge pull request #252 from timschofield/develop

Develop
Merge pull request #253 from timschofield/develop

Develop
Merge pull request #254 from timschofield/develop

Develop
Merge pull request #255 from timschofield/develop

Develop
Merge pull request #256 from timschofield/develop

Develop
Merge pull request #3 from KwaMoja/develop

Develop