Merge pull request #11 from tonimunthi/master

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