Improved usage of Composable helpers. Re-ordered method args.
Handle both implicit and explicit controllers in all matchers.
Bump version