Version 0.2.1 - Fixed clustering issues + general stabilization