added sorting and country and removed null bug
Merge pull request #113 from diego04/master

added sorting and country and removed null bug