Issue 114: Args matches with optional parameters broken

Proposed fix for Issue 114