Update
Merge branch '0.6-dev' of github.com:ribozz/pywizard into 0.6-dev
Some updates