Zendesk issue fix
Merge pull request #65 from Coenego/zendesk-issue

Zendesk issue fix