Put synchronized block around possible race condition
Merge pull request #75 from pfschwartz/develop

Put synchronized block around possible race condition