Fixing merge problems (again)
Merge pull request #10 from ricardowendell/master

Fixing merge problems (again)