some validations
Merge pull request #1 from yaplas/master

some validations