merged c85774c which fixed Issue #33. had to resolve some conflicts as c85774c has been done on feature/zendesk