refactoring
bugfix
Merge branch 'refactoring'