Modified fancy registration to actually work!
Merge remote-tracking branch 'origin/master'