fix of previous commits
fix of previous commits
Merge remote-tracking branch 'origin/master'

Conflicts:
	download/download.py
fix of previous commits