On the semi-classical limit for the nonlinear Schrodinger equation