Request to add changes made by Clemens90 and implemented by him and myself to the master branch.

The new version shows a much better behavior during the "pair of particles" test. Should become our fundamental for further tests and development.