Merging development into master

Includes new RDF generation approach