Refactoring in order to make code more OO
Merge remote-tracking branch 'origin/master'