Merge pull request #179 from shaunarundell/master

fixed #52 - Support external subtitles, final
Merge remote-tracking branch 'upstream/master'