Quite a lot of changes, forgot to commit for a while
Merge branch 'master' of https://github.com/andrepinho/nossobemestar