some changes in master
Merge remote-tracking branch 'origin/master'

Conflicts:
	python/test.py