a
Merge pull request #8 from shichongrui/geolocation

Merging to bring things really back up to speed