Merge pull request #12 from Cloud4AllTUD/JSON-LD

Merge Nicks lates commits and Fix a bug
bugs fixed