Merge pull request #86 from MaxFangX/update-lock