Add location info
Merge branch 'master' into feature/update-location
Merge pull request #1 from EcoHack/feature/update-location

Add location info, more recent hacks