g lock
Merge pull request #21 from malcdi/amyj

g lock