rdf generation revised.
Merge branch 'development'