Merge branch 'release/0.3.4' into develop
update config builder
v 0.3.5
Merge branch 'release/0.3.5'