Added Felix's email
Merge pull request #2 from filipefmelo/master

Merge pull request #1 from filipefmelo/development
Merge pull request #3 from filipefmelo/development

Merge development into master