Changes.
Merge branch 'master' of https://github.com/rockwolf/haskell

Merging.