Parameter refactored
Merge pull request #3 from twalthr/master

Parameters refactored