Code Cleaning
Merge origin/master