Removed Lock
Merge origin/master