Refactoring
Merge pull request #3 from fab-b/master

Refactoring