#3 Several registration bugs
Fixed space
Merge branch 'master' into documentation