Fixed: iss1
Merge branch 'iss1'

Conflicts:
	file1.c