playing around with validations
Merge remote-tracking branch 'origin/master'
playing around with validations