Added a couple of features.

Saw a couple of useful utilities posted to a gist and... used them :)