Location Listener
Merge branch 'loc'