full oop
Merge pull request #20 from cfoellmann/oop

Full OOP