Apply patch from RT-89030
Merge pull request #12 from kevindawson/RT-89030

Apply patch from RT-89030