Update to 1.8
Update to 1.8
Merge pull request #53 from Feuerstern/master

Update to 1.8