Merge pull request #1137 from nandalopes/fix-1136