-Refactoring 1/2
Merge origin/master