Usuario path adjusted
Merge remote-tracking branch 'upstream/master'