Register Functionality
Merge origin/master