Avoiding concurrency issues in the WorkModel
Merge pull request #395 from delving/work-fixes

Avoiding concurrency issues in the WorkModel