uninstall script
Some improvements
Update uninstall script
Merge branch 'aboettger-master'