updated README.md
Merge branch 'develop' into travis_ci