Rebasing according to ni-/ni-dm and keep statistical_estimation activity

Please choose between this PR ( #3 ) and PR #2.

This pull request fixes the merge conflicts with ni-/ni-dm and **keep the statistical_estimation activity** (see PR #2 to remove this activity). 

If you accept this Pull Request, we will then be able to automatically merge your changes into the main ni-/ni-dm repository.