CADMIUM-156
Merge pull request #10 from meltmedia/feature/lock

CADMIUM-156