More Haskell
Merge branch 'master' of https://github.com/bsdshell/haskell
merge