fix error in migration
Merge branch 'issue-39' into develop
update version
Merge branch 'release_0.3.6'