Merge with last Marcelo Version