Added toolbar options (still needs explanation).
Merge branch 'master' into gh-pages