refactoring
Merge pull request #2 from valentinabrui/master

refactoring