Card parameters fix
Merge branch 'master' of github.com:litchfield/merchant into HEAD