fixes
fixed windows nsi
Merge branch 'master' into ubuntu