V0.2.1b: final commit