Fixed locks issue
Merge pull request #3 from allejo/master

Fixed locks issue