More robust
Merge branch 'master' of https://github.com/gafas66/init

Trying to fix merges ...