implement WIZ ;-)
Merge branch 'wiz'
Merge branch 'master' into portable