iliak Merge pull request #1 from ravengangrel/master