added a check over the sigma when diffusion
Merge branch 'v2.0'