Update README.md
Merge branch 'master' into mass_refactoring
Try to fix Travis