Merge pull request #1438 from jonorossi/patch-1