Fix: Url for old source site, and hanging on failed requests
Merge pull request #6 from BWOC/dev

Fix: Url for old source site, and hanging on failed requests