Preparation for version 1.2