Finished implementing the locking package
Merge branch 'master' of github.com:jsfr/PCSD-2013