Merge branch 'master'

Conflicts:
	version1.py
merge