Merge pull request #6 from JohnLato/master

update for ghc-7.8