Display song duration
Merge branch 'master' into gh-pages