merge of Issue-8-Reporting-API-Country-Code branch
fixes #8, #10