Merge pull request #114 from raistlinthewiz/develop

fixed license header-text
Implemented basic master-registry and bootstrapper based on a432511's PR #113.
More refactoring..