Merge branch 'master' of github.com:Dorvaryn/SMSDiffusion
Refactor diffusion layout (cf #5)