v1.0.12 Added validation functions