Add wizard class
Update package install
Merge branch 'develop'