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

L4