More styling and the ability to stop playback
Merge branch 'master' into gh-pages