issue #27 Better Countdown Handling
(cherry picked from commit 3cbc6d4cc5245a567b90332dfcbb397cea6f75ba)
(cherry picked from commit b6261d7b557b72bde5a5137de5ccd55dc91040c3)