Merge pull request #1477 from Vistaus/master