refactored paramater handling
refactored paramater handling
Merge pull request #134 from Pomax/bug882958

refactored paramater handling