Si ii

This branch is complete now, including tests. NB: the latest bug fix in the dust branch has been corrected here too. -> merging this branch into master allows to remove branches SiII and dust.