Merge pull request #11 from jSTE0/overlay-lock