Code cleaning
Merge branch 'origin/master'