Update 1

Extended to allow for matching across scales.  This implementation still
needs some tweaking.