sync
sync
sync
forgotten changes in harmosc
merging changes from Ania