Merge pull request #1326 from BrzVlad/master