navigator branch
Merge pull request #2 from 2jeanine/navigator-branch

navigator branch