navigation is pretty retarded
Merge branch 'master' into gh-pages