fixing stuff
merge with master
Particles
Merge master -> robin_branch
Fixed errors due to merging