Pull Request for Issue620

This is okay because this is in its own application living in its own process right?