added command line unlock
Merge branch 'master' into onsightit