Chiaka1996 develop

[chiaka1996]

Description

Please include a summary of the change and relevant motivation and context.
List any dependencies that are required for this change.

All pull requests should be related to open issues. Indicate the issue(s) bellow and remove this line:
Fixes #(issue number 1) #(issue number 2 if applicable)

How Has This Been Tested?

Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to see how your change affects other areas of the code etc.

Screenshots (if applicable, else remove this line / section)

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have added necessary inline code documentation
• I have added tests that prove my fix is effective and that this feature works
• New and existing unit tests pass locally with my changes