fixes #517
Merge pull request #555 from OCHA-DAP/marianne-dev

fixes #517