Merge pull request #9 from galaviz/master

L3
Merge pull request #33 from yalmasri/master

Merge pull request #9 from galaviz/master - catalog country, state and location