Merge pull request #1 from undf/form

keys changed to more general cases
class modified to image_upload field