Updated README.md
Merge branch 'master' into devel
Updated .travis.yml