Version 0.2: fixed according to stickell advices.