style updated
working
Merge branch 'eloi'
merge ok