Initial, untested update to 1.8.
Complete update to 1.8
Merge pull request #2 from warriordog/master

Update to 1.8