Refactored extra parameters handling
Merge pull request #67 from bettiolo/refactoring_extra_parameters

Refactored extra parameters handling