Better separation between params
Merge pull request #7 from jtapia/2-2-stable

Better separation between params