add locations
Merge branch 'add_locations'