closes #835
solves #640
Merge pull request #840 from OCHA-DAP/marianne-dev

Marianne dev