added some default parameters
Merge remote-tracking branch 'origin/git-closure' into git-updates