Parameterize some variables so that we can override it
Merge pull request #1 from mcanevet/parameterize_variables

Parameterize some variables so that we can override it