Fixed Registration

Fixed registration so it works correctly now.
Merge remote-tracking branch 'origin/master'