#412
Merge pull request #1098 from OCHA-DAP/dev-dan

closes #412