Merge pull request #3 from filipefmelo/development

Merge development into master
Merge pull request #4 from filipefmelo/master

Merge pull request #3 from filipefmelo/development