Better validation of generator form
Merge pull request #224 from gilt/generator_uri_validation

Better validation of generator form