Merge pull request #1 from Pestov/master

Up to date fork