Merge pull request #61 from Edzelopez/GEP-19

GEP-39 Fixed validation error for filefields
GEP-39 Bug fixes