Merge branch 'timezone'
Merge branch 'download'

Conflicts:
	README.md