Merge pull request #22 from krinkinmu/remove-unneeded-lock