Fix validation
Merge pull request #106 from marmelab/fix_validation

[RFR] Fix validation