diffusion is working
Merge branch 'master' of https://github.com/bradleyrp/membrain