Implemented lock-unlock
Merge branch 'master' into lock-unlock-feature
Merge pull request #70 from g-ortuno/lock-unlock-feature

Lock unlock feature