Develop 2.0

[Phenzic]

Description

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

Fixes # (issue)

Type of change

Please delete options that are not relevant.

• [x] Bug fix (non-breaking change which fixes an issue)
• [x] New feature (non-breaking change which adds functionality)
• [x] Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

• [x] My code follows the style guidelines of this project
• [x] I have performed a self-review of my own code
• [x] I ran the sort command to make sure all terms are sorted
• [x] I have made corresponding changes to the ReadMe
• [x] My changes generate no new warnings
• [x] Existing unit test passes locally with my changes

[Olanetsoft]

Thanks for your contribution. I will take a look and get back to you!