Merge pull request #1 from facutuesca/master

Fix to compile with newer versions of GHC
Merge remote-tracking branch 'upstream/master'