Update for 1.8
Merge pull request #7 from TehRainbowGuy/1.8

Update for 1.8