modifying merge conflicts
refactored and oojs code
Merge pull request #46 from georgexzeng/master

refactored code and oojsed