Merge branch 'Refactoring'