More improvements
Merge branch 'master' of https://github.com/robcadwallader/autodemo

Conflicts:
	Proposal.docx