Travis testing
Merge branch 'master' into feature/travis-testing
Merge pull request #1 from gabrielmarcondes/feature/travis-testing

Feature/travis testing