Issue #22 - A small refactor for the oneline-vs-verbose detection.
Issue #22 - Fall back to long/short text is short/long text is not available.
Merge branch 'master' into cache