Validation

I did only little changes in validation because I want checkout if Travis works :)