changes default for wish
merge conflicts
Merge pull request #20 from nemrow/change_wish_default

changes default for wish