Merge pull request #129 from diizzyy/patch-1