Pull Request for Issue620

Like the CLS version, I'm assuming this is running outside of any app controller, so I'm assuming this is okay.