issue #20: add location data