Alex's changes for v1
Merge branch 'version1-alex' into version1

Conflicts:
	readme