FIXTYPO in comments and enhance the Constructor to make sure that alway a valid type is given
Authored by: obw 2017-05-12
Parent: [r25]
Child: [r27]
