Upgrade

resolves #17