Version 0.05: several fixed according stickell advices