isNumberValid written in Calculation
Merge remote-tracking branch 'origin/master'