use isNum
Merge branch 'num-check' into dev