Merge pull request #16 from vikramrajkumar/btsx

Merge upstream
Fix crashes on invalid URLs
Merge branch 'develop' into btsx