Cleaning code
Merged
Merge branch 'master' into franck