add some features
fixing partials
fixing merge conflict
Merge pull request #35 from dmitryshilin/country_feature

Country feature