Very last change for version 1.2.0