Merge pull request #130 from diizzyy/patch-2