cleaned up the setting of parameters
Merge remote-tracking branch 'origin/master'