Made it object oriented with class support
Merge pull request #2 from gmoz22/feature/convert-to-object-oriented

Made it object oriented with class support