merge pull request #200 from larchanka/master