Merge pull request #221 from colemanw/navigation