Merge pull request #270 from kevinawoo/hotfix/git-locked

git-locked