added clustering support
Merge branch 'master' of https://github.com/mzbenami/watermelon