update version
Merge branch 'release_0.3.6'
Merge branch 'master' into develop