rvasily Merge pull request #185 from zelenin/master …