Updated installer, added uninstaller