Merge pull request #381 from barijaona/bugfixes

Fix issue #367 - tested ok!
Be more tolerant on parsing some feeds (issue #383)