more housekeeping
Merge branch 'amnuts'

Conflicts:
	examples.html