Start upgrade.
Agg upgrade.
Fix error retry.
Better word count with delay.
0.4.0
Merge branch '0.4.x'