username file
Merge pull request #1022 from juanalverto/juanalverto

Merging PR from @juanalverto