Addresses parts of #605 #606

Changes proposed in this pull request:

• Your_changes

The following steps were realized, as well (if applies):

• Use in-line comments to explain your code
• Write docstrings to your code (example docstring)
• For new functionalities: Explain in readthedocs
• Write test(s) for your new patch of code (pytests, assertion debug messages)
• Update the CHANGELOG.md
• Apply black (black . --exclude docs/)
• Check if benchmark tests pass locally (EXECUTE_TESTS_ON=master pytest)

Please mark above checkboxes as following:

• Open
• Done

❌ Check not applicable to this PR

_{For more information on how to contribute check the CONTRIBUTING.md.}