Fix for ghc 7.6.1 compilation
bump version
Merge branch 'hotfix/0.3.1'