allowing the storing and rendering of clusters
Merge remote-tracking branch 'origin/master'