Merge with bugfix-0.5
/mp3togo/cluster.py