Proof of concept
Merge remote-tracking branch 'remotes/upstream/master' into develop

* remotes/upstream/master:
  Proof of concept

Conflicts:
	README.md