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