Added compound registry class
Merge remote-tracking branch 'upstream/devFreeServer' into compound-registry
Merge pull request #15 from lasso/compound-registry

Compound registry