Improve validations
Merge pull request #77 from andrerod/opt-in

Improve validations