Merge branch 'master'

Conflicts:
README.md
resolve conflict