Completion of validation methods (updated)

bugs fixed*
Merge pull request #9 from AlexNaj/dev

Dev
Merge pull request #10 from jparishy/dev

Dev