new locking system
Merge pull request #68 from cleandart/newLocksLocker

new locking system