Navigation fixes
Merge pull request #37 from yurikuzn/fixes

Fixes