camera a bit higher
Merge branch 'master' into gh-pages