Merge pull request #800 from pyr/feature/riemann-batch