enhancing navigation
enhancing navigation
Merge pull request #2411 from awesomerobot/master

navigation enhancements