Merge of the `development` branch.

This is just so far just plain merge of the development branch. We can work in this pull request everything what's still missing. Do we need to do anything about documentation, remove some stuff, or something?