registration bug fix nr. 2
Merge origin/master