Merge branch 'master' of https://github.com/mattes34/FeedParser.git