Proper int checking
1.6.0