Merge branch 'pyr/riemann'