Merge pull request #40 from Trott/sampleApp

rm redundant code
Merge pull request #41 from Trott/sampleApp

correct issue with tracks with numeric names
Merge branch 'master' into sampleApp