Merge pull request #853 from andytaylor/master

fixed a couple of jiras.
Removed some synchronized blocks