ML-28 done.
Bug with static initialisation fixed.
ML-13 Clusterizer
Merge branch 'ML-13' into develop