merge: kstoertebecker
fix: registration