Improve upgrade behaviour
Merge pull request #130 from unpairedbracket/master

Improve upgrade behaviour