ADD: mod_wizard
CHANGE: several bugfixes in the wizard
Merge remote-tracking branch 'origin/master'