Merge pull request #100 from vexxhost/use-decorator

Use decorator for lock