closes 588
Merge pull request #628 from OCHA-DAP/org-issues

closes 588