Allow both grouped and non-grouped arguments

Fixes #132.
Merge pull request #133 from kevva/non-grouped

Allow both grouped and non-grouped arguments