Update the MSI
Merge pull request #63 from ogail/msi

Update the MSI
Merge pull request #855 from ogail/dev

Merge reviewed code