adding uninstall option
Merge branch 'dev'