adding return capabilities

Conflicts:

	example.txt
Merge branch 'return'

Conflicts:
	example.txt