Merge pull request #27 from LaurenDM/LaurensSandbox

added deadlock fix