updated docs to reflect recent changes.
Merge branch 'master' into timer