Merge branch 'hotfix/0.3.1' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Added .coveragerc to manifest