147 - nav edits
Merge pull request #231 from gsn/master

147 - nav edits