add support for locations
release 2.2