Merge pull request #169 from unepwcmc/hotfix--0.4.2

Hotfix  0.4.2 (Fixes Issue #39 )
Merge branch 'master' into develop
Merge branch 'develop' of github.com:unepwcmc/SAPI into develop