Merge pull request #3 from patrick3coffee/master

update to include navigation