Fix "now" functionality: show "now" if less 1 minute.
Merge branch 'hotfix/v1.0'