Grand Total for Subcategories on a matrix?

Hi all,

I have a simple matrix with two categories in Rows (Client and Country), and one set of values (Revenue).

I would like the Grand Totals for both categories, Client and Country. Is that possible?

Stepped Layout is "off" so i can have both rows categories in separate columns, but i don't mind if i have to turn it on.

I have something like this:

And i would need something like this:

Thanks in advance!!