Merge remote-tracking branches 'origin/master' and 'upstream/master'

Issue 119: download win files with different extension to exe