Merge pull request #1878 from ZappoMan/bugfixes

fix particle init