Trying to fix kwargs for clustering with coverage
Merge master into experimental development