Merge branch 'release/0.3.1' into develop
Merge pull request #2 from ecomfe/develop

Merge branch 'release/0.3.1' into develop