removed lock
Merge https://github.com/GoogleJump/Tardis