Bad commit where there is too many things too describe :/
Merge branch 'master' of https://github.com/andrepinho/nossobemestar