Merge pull request #1556 from danielg4/master