Manual merge of pull request #5 - Px3 particles by lukaspj
(due to conflicts)