one-line
Merge branch 'master' of github.com:kerinin/clustering