Stable version with own location button.
Merge remote-tracking branch 'origin/master'