Merge pull request #127 from paczian/master

working wizard version