fix travis configuration
Merge branch 'master' into develop
Merge pull request #12 from tonimunthi/develop
Merge pull request #13 from dayax/develop

merge from develop