Adjustments for new linked data scheme.
Merge branch 'master' of github.com:sosol/sosol

Merge commit.