Merge branch 'master' into multiple-titles
allow multiple titles for a track
Merge pull request #20 from Trott/multiple-titles

Multiple titles