Merge pull request #743 from HenryGiraldo/master