Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 2d5661fa7c75dd66b15bbf81eddde740935f7fcd.

Conflicts:
	README.md

Try to fix unsuccessful merging.