Updated navigation

See #184
Merge branch 'master' into gh-pages