Merge pull request #249 from diizzyy/patch-2