Merge branch 'master' into minor-features

Conflicts:
README.md
config.json