Merge branch 'master' into zure-init

Conflicts:
README.md