Merge pull request #145 from Klap-in/master

Various bug fixes
Merge remote-tracking branch 'upstream/master'
Feed plugin uses the 'threads' lang string
reformatting and notes