Merge pull request #487 from jorgifumi/patch-1