Merge branch 'develop'
Merge branch 'develop' into master
Merge branch 'develop' into master
Bug fix: missed a factor of 1/4pi in L_j_ff()
Add references to the emissivities
Merge branch 'master' into develop
Introduce a radius-dependent plasma model