Merge pull request #1 from cryptozoidberg/master

Update jahrsg fork from original
windows setup script (InnoSetup)
Merge pull request #33 from jahrsg/master

Windows setup script (InnoSetup)