Tested and fixed authToken management
Added support for GeoLocation