merge rdfstore and master branch