some waste changes
minor changes
Merge branch 'waste'

Conflicts:
	README.md