webmaxru Merge pull request #40 from combimauri/master