Fixed config bug caused by old subtitle system #18.
Merge remote-tracking branch 'pistachitos/Pistachitos' into Pistachitos