Fix crashes on invalid URLs
Merge branch 'develop' into btsx
Merge pull request #17 from vikramrajkumar/btsx

Merge upstream