a PR just for you @cjoudrey

How about this one?

Like it? :)