Added locking to batch queries
Merge branch 'master' of github.com:joejoyce/projectjuliet