Merge branch 'feature/clean' into release/v1.0.0