Update to 1.8
Merge pull request #1 from Morphan1/master

Update to 1.8