Merge pull request #133 from paczian/master

wizard updates