Changes, no horrible particles to be seen!
Merge remote-tracking branch 'origin/master'