Added intensity property to particles
Merge from master