closes #318 for good one hopes
resolves lingering issues with #384
Merge pull request #479 from OCHA-DAP/marianne-dev

closes #318 for good one hopes