Improved clustering
Merge branch 'master' of github.com:bikecomps/simulation