Navigation Issue fixing
Merge pull request #4 from cassiopaia/master

Navigation Issue fixing