Validation refactoing
Merge pull request #16 from collectrium/validation_refactor

Validation refactor