added wizard and other stuff, also some fixes here and there.
Merge pull request #8 from olear/master

added wizard and other stuff, also some fixes here and there.