iss54
Merge branch 'iss54'

Conflicts:
	sample.txt