#108 Fix concurrent updates
Merge pull request #259 from drexin/wip-108-fix-concurrent-updates-drexin

#108 Fix concurrent updates