Merge pull request #574 from Hackzzila/patch-1