[Add] Basic validator
Merge remote-tracking branch 'origin/master'