Merge branch 'release/0.3.5' into develop
Fix configuration parsing
Update version.
Merge branch 'release/0.3.6'