With somewhat better (or, perhaps not) variable names.
Merge branch 'master' of https://github.com/chalmers-kandidat14/haskell-folder