Rebased with latest master changes

@AntonioMA