Merge beneficial changes from DerDaku/master #4
Description
Please evaluate and if there are useful features, merge this upstream pull request into a new PR: #DerDaku:master.
Make sure there are no regressions or breaking changes and that there isn't a loss or duplication of features.
After merging, implement any additional tests and review code quality to keep it in line with project guidelines.