Fixed particle
Merge branch 'Austin'