update _timemap_ to use multiple lock.

- Individual access to the element no longer blocked
Merge remote-tracking branch 'origin/master'