fix views and added country to class
Merge pull request #4 from cmsalmeida/master

fix views and added country to class