Changed some code around
Merge remote-tracking branch 'origin/master' into particle-test