Merge branch 'release/0.2.0'
Add missing lock file
Merge branch 'master' into develop