Added "now" marker.
Merge branch 'master' into gh-pages