Now supporting locations.
Merge pull request #102 from Godin1605/feature/location

Now supporting locations.