Adding support for DBRefs
Merge branch 'release/1'