Revert "improvements"

This reverts commit 4f2f8608b62b7f1cbcde90aa39b249f6a194860d.
Revert "Revert "improvements""

This reverts commit e56a02d9746fa41f14c387304228ea1aa12fa66a.
Revert "Revert "Revert "improvements"""

This reverts commit 02bf6e12c339a051cf12514be1cb0f1b928135a9.
improvements

This rolls back to commit 4f2f8608b62b7f1cbcde90aa39b249f6a194860d.
Revert 4f2f860..84b410b

This rolls back to commit 4f2f8608b62b7f1cbcde90aa39b249f6a194860d.
Merge pull request #1 from EmanuelKuhn/in-progress

In progress