last changes
Merge branch 'master' into marta
final stuff