Merge pull request #1100 from BrzVlad/master