Merge branch 'release/0.5.1'
Add missing dependancy for lockfile.
Bumped version number
Merge branch 'hotfix/0.5.2' into develop