Refactoring
Merge branch 'master' into domain
Refactoring
Refactoring
Merge
Merge branch 'master' into refactor
Merge from master
Refactoring
Merge pull request #56 from Diabol/refactor

Refactoring