Merge pull request #60 from Edzelopez/GEP-19

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