new file
Merge remote-tracking branch 'origin/issue2' into nightly

Conflicts:
	README.md