Merge pull request #123 from gameblabla/diablofix_hack