Countries class from master
PHPDoc updates