Fixed code duplications
Merge branch 'master' of github.com:alcesleo/registry