bug fixed
Merge branch 'somebug'

Conflicts:
	test2.rtf