Can further customize merchant's parameters
Merge branch 'master' into heroku