Some refactoring.
Merge pull request #1 from aybbou/dev

Some refactoring.