fetchUser
fix merge
Merge branch 'javier747-master'