Ported changes to user script version. Fixes #16.

This ports the changes from aff173cdfe2b9ec6b2ab95d6bb16a1656f8fa3fe to 52649974259259b3ac0a930649a95a5c1ee09736 over to the user script version.

The user script version now supersedes the original. I'm not sure how you want to organize the deletion of the original, so I'll leave that up to you.