Issue #210, #173
Issue #173
Merge branch 'feature-jsonld' into development