fixed a bug with trying to get location information by a wrong way
Merge branch 'master' into grunted
as always