Updated to 1.8 - Fixes #7