Fix 139 - Integrate the Location class