Finished objectifying and refactoring all code
Merge pull request #36 from georgexzeng/master

Finished objectifying and refactoring all code