Had some weird merge problems with lockedBy code. Fixed now
Merge pull request #142 from eestrada/master

Had some weird merge problems with lockedBy code. Fixed now