More changes for the Installer
Merge pull request #26 from BigXplosion/master

More changes for the Installer