Refactor
Merge origin/master