Safer change of UI
Merge pull request #96 from leplatrem/patch-3

Safer change of UI