Merge branch 'master' of https://github.com/kenkku/SimoGoesHaskell