Last change for v1.0.0 without image