Fix for corrupt keywords.
Merge remote-tracking branch 'origin/develop' into fix_wizard
Merge pull request #998 from ismailsunni/fix_wizard

Fix wizard