Merge pull request #781 from Ansuel/patch-1