many many changes
cleaning
distance computing
Merge remote-tracking branch 'marta/master'
better generate from cloud