Building on GHC 7.6.3 and HEAD
Added testing; bugfixes.