Changes after testing Validator
Merge pull request #6 from uipo/master

Canges after testing Validator