Improved upgrade routine for 2.0 --> 2.1.
Fixed version number.