Minor fixes in the code.
Merge branch '2' of https://github.com/Gizra/entity_validator into 2