Adapted for more tolerant reinstall
Merge pull request #14 from AltGr/tolerant-reinstall

Adapted for more tolerant reinstall