Merge pull request #957 from zayass/patch-2