Merge code with tyler569/RDF-CH