added locking
Merge branch 'master' of https://github.com/hessonam/nymi