fixing problem with integer validation
Merge remote-tracking branch 'origin/solomon' into solomon