Merge remote-tracking branch 'upstream/master'
Fixed the travis issue
Merge pull request #7 from luan-cestari/FIX_TRAVIS

Fix travis