Cleaning up
Merge branch 'feature/CleanUp' into release/0.0.7