added support for ISP and Org databases
Merge pull request #4 from mteodoro/isp-org

added support for ISP and Org databases