registere fix
Merge origin/master
registere works now
fixed errors on following files