Fixed #22 validation errors and wrapped a field value
Merge branch '22_Field-wrapper' into next