Added Sri Lanka query and improved addr_import
Merge pull request #140 from timlinux/master

Added Sri Lanka query and improved addr_import