Initial commit
Merge remote-tracking branch 'origin_alt2/master' into alt

Conflicts:
	README.md