Merge pull request #561 from zx2c4/patch-2