Merge pull request #3 from filipefmelo/development

Merge development into master