Merge pull request #417 from udoprog/udoprog/riemann