Implement Registry class
Small changes
Fixed conflicts
Merge pull request #5 from electronrussia/master

Implement Registry class