Merge pull request #251 from weissjeffm/new-navigation