Recreate changes for EUDAT-443
Merge pull request #62 from SimpleStore/EUDAT-443b

Recreate changes for EUDAT-443