Moved Lock package to a subpackage instead
Merge branch 'master' of github.com:jsfr/PCSD-2013