Merge pull request #10 from hvr/pr-base48

Changes to accomodate GHC HEAD/7.10