Added map navigation.
Merge branch 'origin/master'