new version
Merge remote-tracking branch 'origin/refactoring' into refactoring
Merge pull request #87 from Assada/refactoring

Refactoring