Add support for defaultApiToken
MINOR: Fix whitespace
Merge pull request #12 from exlee/parametrization

Parametrization branch