Merge pull request #17 from cristiroma/master

refs #1965 - Change region to field_country in code