cleaning
upd docs
adding object id helper
Minor refactoring
Merge branch 'master' into gh-pages