Fixed Upgrade procedure. Fixes #14