Simplify validation
Merge pull request #15 from danielsoro/simplify-validation

Simplify validation