Merge pull request #66 from g-ortuno/reset-feature

Reset feature implementation
Merge branch 'master' into lock-unlock-feature