Red feature changes
More changes
Merge branch 'red-feature'

Conflicts:
	README.txt