improved upgrade task
Merge pull request #72 from idleberg/2.0-dev

improved upgrade task