Preparation for version 0.3