refactoring
Merge branch 'libRefactoring'