fix Issue #38
fix Issue #47
move integer field validator