Merge branch 'downloading_option'
Merge branch 'master' into downloading_option