add color mask + particle end position
Merge remote-tracking branch 'upstream/master'
Updates