Changed parameters
Merge pull request #31 from soosterwaal/step_7

Changed parameters