navigation pull request

for #3