Merge codes from bookmark.
Merge branch 'master' of https://github.com/weijia/obj_sys