Merge pull request #387 from diizzyy/patch-2