initial commit

commit 2
Merge pull request #671 from safiyu/nav

fixed issue #670