New code
Merge branch 'master' of https://github.com/diogoamatos/diogoamatos.github.com