Transversity and Collins functions from SIDIS and e+ e- data