Wizard update
Merge pull request #45 from neurospeech/dev

Wizard update