Merge branch 'master' of http://git.stderr.nl/matthijs/projects/cλash-paper