updated in master branch
Merged with master

Conflicts:
	test.txt