Includes also images without link. Closes #34