added new functions
Merge remote-tracking branch 'origin/particle_class'