[v.1.1.1] Last improvement before release