Add PROGRAMFILES check on windows
Merge branch 'update' into update.macosx