This committ contains the final version of 1.0.2