Merged conflicts
Merge pull request #20 from tiagom87/henrique_merge

Merged conflicts