Merge pull request #20 from Project-4398/wizard

Update Master
Merge pull request #21 from Project-4398/Master

Merge pull request #20 from Project-4398/wizard