Allow travis run on all branches
Merge branch 'master' into improvements