Fixed Issue 155 & then some
Merge pull request #158 from ZendeskES/j/155

Fixed Issue 155 & then some