Fixed geolocation; tidied up
Merge pull request #27 from chin-andrew/master

Fixed geolocation; tidied up