Register and LoL Register fix 2
Merge remote-tracking branch 'origin/philip-branch'