fix locking issue
Merge branch 'master' of github.com:yurivangeffen/CCPrac2