Reworked the image gathering mechanism (see #1)
Release 3.0.0 stable