Refactored implementation based on Henris comments
Merge pull request #2 from mheinola/navigator

Refactored implementation based on Henris comments