enhanced oop oriented structure
Merge pull request #4 from pierluigi83/master

Enhanced OOP