Installer tweak & clean
Merge branch 'master' of https://github.com/Crossfire972/tormedom