Last fine-tuning for version 0.3