Fix needed for GHC 7.8
Merge pull request #25 from hamishmack/master

Fix for GHC 7.8