Compilation with GHC 7.8.2
Merge pull request #31 from willy-s/master

Compilation with GHC 7.8.2