#401
Merge pull request #407 from OCHA-DAP/bugfix-401

Pull request for #401
Merge pull request #408 from OCHA-DAP/dev

merged