Rewrite object tree.
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from feifanhe/master

Rewrite object tree