Fixing Travis
Merge branch 'master' into hello-world