refactor 6
Merge pull request #81 from Assada/refactoring

refactor 6