Merge pull request #1030 from giner/patch-2