Added validations for less_than and greater_than
Merge branch 'master' into develop