Enh/rdf

updating rdf branch to reflect current master