.
Merge branch 'rafaelsm1988-master'