Make progress on 'detect a mastercard brand'

#438 fixes