Correct passing of optional param
Merge remote-tracking branch 'upstream/master'
Updated gems