Merge pull request #846 from abatishchev/patch-1