Revert "Revert "Merge pull request #433 from resouer/patch-3""

This reverts commit 32aaadba409083061b17a5ecca592c0928f07c43.