More OOP
Merge pull request #1 from aufarik/test

More OOP