Revert "Reworked the image gathering mechanism (see #1)"

This reverts commit dad524b04eb2b247e8ac5352dc0e491cd8a58055.
Reworked the image gathering mechanism (see #1)
Release 3.0.0 stable
Merge branch 'develop'