Edits suggested by Alexis
Merge branch 'master' of https://github.com/lex4all/lex4all