change upgrade order
Merge pull request #28 from wakeup/patch-1

change upgrade order