Clustering fix
Merge pull request #158 from lev-kuznetsov/master

Clustering fix