Merge pull request #297 from diizzyy/patch-3