Update to 1.8
Merge pull request #1 from domse/patch-1

Update to 1.8