Merge pull request #1 from dakshhmehta/develop

Fixing 4.2 bug
Removed lock file