Lockpick update
Merge pull request #2 from Sbotkin/master

Merge