Fixed travis errors
Merge branch 'master' into kingman