Registration, needs improvements
Merge pull request #3 from DBroKnas/master

Registration, needs improvements