Finnaly up to version 1.0.2