Merge pull request #40 from chreijmer/fluxes

Fluxes