Merge branch 'refactoring'