Navigation Fix #2
Merge pull request #89 from P4V4/master

Navigation Fix #2