iss1
Merge branch 'master', remote-tracking branch 'origin' into iss

Conflicts:
	sample.txt