rastro

rastro
Merge remote-tracking branch 'origin/daniel' into ignaciosiri