Corrections by Lars and Dani.
Merge branch 'master' of https://github.com/Wirack/p6