objectifying more code
Merge pull request #32 from georgexzeng/master

objectifying more code
resolve merge conflict
resolve additional merge conflicts
fix merge conflict