Fix for #14

Image matching