A test pull request. Merging my copy of the master branch into the authoritative one.

Just added a cool new function.