Simple validation
Fixed validation
Merge pull request #3 from TO2-2014-Kosci/validation

Validation