Fixing travis
Merge pull request #746 from vi4m/develop

I hate travis