OOP revisions
minor revisions
Revised OOP and methods
Merge pull request #4 from blackmist87/apply_oop

OOP revisions