url_plugin update and some other fixes
Merge pull request #37 from Masterkatze/master

url_plugin update and some other fixes