Merge commit 'f9d0d7241aa772955c2c49ffbb7a1dbf588e3aa9'

Conflicts:
README.md