Merge ultima version Rafa