Merge pull request #199 from agpanarin/master