changed wish and type validations
Merge pull request #23 from nemrow/validations

changed wish and type validations