Merge pull request #981 from colemanw/creditCard