merged master into src/write_riemann.c