update version
Merge branch 'release_0.1.2'
add lock file
Merge branch 'master' into develop