Concurrency bug fix
Merge pull request #104 from taylorsw/master

Concurrency bug fix