[enhancement] Introduced smarter validation
Merge pull request #37 from wallner/ValidatorEnhancement

[enhancement] Introduced smarter validation