Merge pull request #1 from benlaan/master

Merging
Use old UpgradeCode
Merge pull request #4 from flcdrg/Wix-Upgrades

Wix upgrades