closes feature #22 add validate method
Merge branch 'edge' into staging