Merge pull request #1297 from iemejia/master