Validate user input
Merge pull request #1 from mrb/validate_user_input

Validate user input