Refactoring
Merge origin/master