Feature/location and hotel

fixes #11