Merge pull request #1529 from Vistaus/master