added some more locks for concurrency
Merge branch 'master' of https://github.com/rmarini/noodle-mation