Merge pull request #199 from eHealthAfrica/develop

merge 0.5.0
Merge pull request #201 from eHealthAfrica/master

sync commit history (pull request artefact)