Herrera-Zufiria v0
Merge branch 'master' of https://github.com/ikerbv/clustering