conflict resolution
Merge pull request #10 from Starchup/registration-fix

Registration fix