*** merge : version 0.0.3