Modifications for building with ghc 7.7
Merge pull request #7 from markwright/master

Modifications for building with ghc 7.7