change integer check
Merge branch 'module/calc' into dev