Use short message if no full message
Merge pull request #35 from danieljamesscott/use-short-message-if-no-full-message

Use short message if no full message