Add possibility to pass parameters by arguments
Merge origin/master