Merge pull request #2 from Bobby9002/master

Pull Request 12/11/13
object oriented
Conversion to Object Oriented
Updated functions and object-oriented code