added arguments for cmd line
Merge branch 'master' into alex